From 98c0e2d83d45dfbe43862077154885500093893d Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Wed, 6 May 2015 10:33:38 +0200 Subject: [PATCH] Cleanup: - Dereference arguments before matching - use square brackets for vec! macro --- src/cargo/ops/cargo_compile.rs | 8 ++++---- src/cargo/ops/cargo_rustc/mod.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 0b7988c39..f49a1fb34 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -167,8 +167,8 @@ pub fn compile_pkg(package: &Package, options: &CompileOptions) let to_build = packages.iter().find(|p| p.package_id() == pkgid).unwrap(); let targets = try!(generate_targets(to_build, mode, filter, release)); - let target_with_args = match target_rustc_args { - &Some(args) => { + let target_with_args = match *target_rustc_args { + Some(args) => { if targets.len() > 1 { return Err(human("extra arguments to `rustc` can only be \ invoked for one target")) @@ -178,10 +178,10 @@ pub fn compile_pkg(package: &Package, options: &CompileOptions) profile.rustc_args = Some(args.to_vec()); Some((target, profile)) }, - &None => None, + None => None, }; - let targets = target_with_args.as_ref().map(|&(t, ref p)| vec!((t, p))) + let targets = target_with_args.as_ref().map(|&(t, ref p)| vec![(t, p)]) .unwrap_or(targets); let ret = { diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 839ec31f7..a06f7a6e1 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -664,7 +664,7 @@ fn build_base_args(cx: &Context, cmd.arg("-g"); } - if let &Some(ref args) = rustc_args { + if let Some(ref args) = *rustc_args { cmd.args(args); } -- 2.30.2